factory: handle properly snapd_recovery_mode based on modeenv value #214
+13
−2
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The real source of true for the current mode is stored in /var/lib/snapd/modeenv this value might be altered after /usr/lib/systemd/system-generators/journald-console was already run. Or /var/lib/snapd/modeenv did not even exist at that time. This happens in install/factory-reset/recovery modes which might be handled within the initrd. If this is detected, update journald-console generator and remove already created journald.conf.d/core-override.conf overlay. Signed-off-by: Ondrej Kubik <[email protected]>
|
Redone as per @xnox suggestion |
xnox
reviewed
Oct 13, 2023
| rm /run/systemd/journald.conf.d/core-override.conf | ||
| cmdline_mode="$(/usr/libexec/core/get-arg snapd_recovery_mode) | ||
| sed -i 's/snapd_recovery_mode=run/snapd_recovery_mode='"${cmdline_mode}"'/g' /usr/lib/systemd/system-generators/journald-console | ||
| fi |
There was a problem hiding this comment.
is this hunk still needed, given the improved generator? cause in core22 pull request it is now not needed, or am i missing some other core20 vs core22 differences?
|
See comment in #213 |
|
Newer series must be merged first. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The real source of true for the current mode is stored in
/var/lib/snapd/modeenvthis value might be altered after/usr/lib/systemd/system-generators/journald-consolewas already run.Or
/var/lib/snapd/modeenvdid not even exist at that time.This happens in
install/factory-reset/recoverymodes which might be handled within the initrd.If this is detected, update
journald-consolegenerator and remove already createdjournald.conf.d/core-override.confconfig overlay.